From fb80622ecbede8eb4e655d4cf33dcb68b2d6fcb2 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Tue, 16 Aug 2016 07:55:07 +0200 Subject: [PATCH] Reworked debian/ files * Rename 1.7 -> 1.8 * Update my mail address * Update Vcs-* field * Add libpcl-{2d,ml,stereo}1.8 packages * Simplify install files * Update standards version, no changes needed * Remove dbg package in favour of debsym * Add openni2 dependency --- debian/README.Debug | 39 --- debian/control | 244 ++++++++++-------- debian/copyright | 4 +- ...apps1.7.install => libpcl-apps1.8.install} | 0 ...on1.7.install => libpcl-common1.8.install} | 0 debian/libpcl-dev.install | 19 +- debian/libpcl-dev.lintian-overrides | 21 -- debian/libpcl-doc.docs | 2 +- debian/libpcl-doc.lintian-overrides | 36 --- ...1.7.install => libpcl-features1.8.install} | 0 ...s1.7.install => libpcl-filters1.8.install} | 0 ...pcl-io1.7.install => libpcl-io1.8.install} | 0 ...ee1.7.install => libpcl-kdtree1.8.install} | 0 ....7.install => libpcl-keypoints1.8.install} | 0 debian/libpcl-ml1.8.install | 1 + debian/libpcl-octree1.7.lintian-overrides | 3 - ...ee1.7.install => libpcl-octree1.8.install} | 0 ....7.install => libpcl-outofcore1.8.install} | 0 debian/libpcl-people1.7.lintian-overrides | 2 - ...le1.7.install => libpcl-people1.8.install} | 0 ....install => libpcl-recognition1.8.install} | 0 ...install => libpcl-registration1.8.install} | 0 ...all => libpcl-sample-consensus1.8.install} | 0 ...ch1.7.install => libpcl-search1.8.install} | 0 ...install => libpcl-segmentation1.8.install} | 0 debian/libpcl-stereo1.8.install | 1 + ...e1.7.install => libpcl-surface1.8.install} | 0 ...1.7.install => libpcl-tracking1.8.install} | 0 ...nstall => libpcl-visualization1.8.install} | 0 debian/libpcl1.7-dbg.install | 1 - debian/libpcl1.7-dbg.lintian-overrides | 3 - debian/rules | 30 +-- debian/watch | 2 +- 33 files changed, 153 insertions(+), 255 deletions(-) delete mode 100644 debian/README.Debug rename debian/{libpcl-apps1.7.install => libpcl-apps1.8.install} (100%) rename debian/{libpcl-common1.7.install => libpcl-common1.8.install} (100%) delete mode 100644 debian/libpcl-dev.lintian-overrides delete mode 100644 debian/libpcl-doc.lintian-overrides rename debian/{libpcl-features1.7.install => libpcl-features1.8.install} (100%) rename debian/{libpcl-filters1.7.install => libpcl-filters1.8.install} (100%) rename debian/{libpcl-io1.7.install => libpcl-io1.8.install} (100%) rename debian/{libpcl-kdtree1.7.install => libpcl-kdtree1.8.install} (100%) rename debian/{libpcl-keypoints1.7.install => libpcl-keypoints1.8.install} (100%) create mode 100644 debian/libpcl-ml1.8.install delete mode 100644 debian/libpcl-octree1.7.lintian-overrides rename debian/{libpcl-octree1.7.install => libpcl-octree1.8.install} (100%) rename debian/{libpcl-outofcore1.7.install => libpcl-outofcore1.8.install} (100%) delete mode 100644 debian/libpcl-people1.7.lintian-overrides rename debian/{libpcl-people1.7.install => libpcl-people1.8.install} (100%) rename debian/{libpcl-recognition1.7.install => libpcl-recognition1.8.install} (100%) rename debian/{libpcl-registration1.7.install => libpcl-registration1.8.install} (100%) rename debian/{libpcl-sample-consensus1.7.install => libpcl-sample-consensus1.8.install} (100%) rename debian/{libpcl-search1.7.install => libpcl-search1.8.install} (100%) rename debian/{libpcl-segmentation1.7.install => libpcl-segmentation1.8.install} (100%) create mode 100644 debian/libpcl-stereo1.8.install rename debian/{libpcl-surface1.7.install => libpcl-surface1.8.install} (100%) rename debian/{libpcl-tracking1.7.install => libpcl-tracking1.8.install} (100%) rename debian/{libpcl-visualization1.7.install => libpcl-visualization1.8.install} (100%) delete mode 100644 debian/libpcl1.7-dbg.install delete mode 100644 debian/libpcl1.7-dbg.lintian-overrides diff --git a/debian/README.Debug b/debian/README.Debug deleted file mode 100644 index a51a84d8..00000000 --- a/debian/README.Debug +++ /dev/null @@ -1,39 +0,0 @@ -Debug packages -====================================================================== - -This is a package with debug symbols. The purpose of a -dbg package -is to provide a mapping between binary addresses and source line -numbers/variable names, not to provide the source itself [1]. - -The source itself is in the source package, which can be installed with -"apt-get source $package" if you have a deb-src line in -/etc/apt/sources.list. This installs it in the current directory owned -by the current user (i.e. conveniently editable), while apt-get -install files are normally owned and editable only by root. - -It's working if your debug backtraces are of the form: - -#3 0x0000000000ed4188 in SGPropertyNode::set_string (this=0x7eaa480, - val=0x20d79a0 "Shaders/cloud-shadowfunc.frag") - at /home/palmer/fs_dev/git/simgear/simgear/props/props.cxx:511 - -(note the file name and line number) rather than - -#2 0x00007ffff5aef83d in g_input_stream_read () - from /usr/lib/x86_64-linux-gnu/libgio-2.0.so.0 -#3 0x00007ffff669c3e5 in ?? () - from /usr/lib/x86_64-linux-gnu/libgdk_pixbuf-2.0.so.0 - -To make useful this package install the corresponding source package -following the instructions above explained and configure gdb [2] to -use it, or qtcreator [3], or whatever IDE do you use. - - -Leopold Palomo-Avellaneda -May 2014 - ------ -[1] https://lists.debian.org/debian-mentors/2014/05/msg00194.html -[2] https://sourceware.org/gdb/onlinedocs/gdb/Source-Path.html -[3] http://qt-project.org/doc/qtcreator-2.8/creator-debugger-engines.html - diff --git a/debian/control b/debian/control index b87a5283..dc5c3d5d 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: pcl Maintainer: Debian Science Maintainers Uploaders: Thomas Moulard , - Jochen Sprickerhof , + Jochen Sprickerhof , Leopold Palomo-Avellaneda Section: libs Priority: extra @@ -17,19 +17,20 @@ Build-Depends: debhelper (>= 9), dh-exec (>=0.3), libflann-dev, libvtk6-dev, libqhull-dev, - libopenni-dev [amd64 arm64 armel armhf i386 mips mipsel powerpc ppc64el], + libopenni-dev [!s390x !alpha !hppa !hurd-i386 !kfreebsd-any !m68k !sh4 !sparc64], + libopenni2-dev [!armel !hppa !hurd-i386 !kfreebsd-any !m68k !powerpcspe], libqt5opengl5-dev, libqt4-opengl-dev, libusb-1.0-0-dev, freeglut3-dev, libxmu-dev, libxi-dev, - libvtk6-qt-dev [!armel !armhf] + libvtk6-qt-dev Build-Depends-Indep: doxygen, doxygen-latex -Standards-Version: 3.9.6 -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/pcl.git -Vcs-Git: git://anonscm.debian.org/debian-science/packages/pcl.git +Standards-Version: 3.9.8 +Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/pcl.git +Vcs-Git: https://anonscm.debian.org/cgit/debian-science/packages/pcl.git Homepage: http://www.pointclouds.org/ Package: libpcl-dev @@ -40,9 +41,10 @@ Depends: libboost-all-dev, libflann-dev, libvtk6-dev, libqhull-dev, - libvtk6-qt-dev [!armel !armhf], - libopenni-dev [amd64 arm64 armel armhf i386 mips mipsel powerpc ppc64el], - libpcl1.7 (= ${binary:Version}), + libvtk6-qt-dev, + libopenni-dev [!s390x !alpha !hppa !hurd-i386 !kfreebsd-any !m68k !sh4 !sparc64], + libopenni2-dev [!armel !hppa !hurd-i386 !kfreebsd-any !m68k !powerpcspe], + libpcl1.8 (= ${binary:Version}), ${misc:Depends} Suggests: libpcl-doc Description: Point Cloud Library - development files @@ -56,28 +58,30 @@ Description: Point Cloud Library - development files This package contains development files (headers and shared library symbolic link). -Package: libpcl1.7 +Package: libpcl1.8 Architecture: any Multi-Arch: foreign Depends: ${misc:Depends}, - libpcl-apps1.7, - libpcl-common1.7, - libpcl-features1.7, - libpcl-filters1.7, - libpcl-io1.7, - libpcl-kdtree1.7, - libpcl-keypoints1.7, - libpcl-octree1.7, - libpcl-outofcore1.7, - libpcl-people1.7, - libpcl-recognition1.7, - libpcl-registration1.7, - libpcl-sample-consensus1.7, - libpcl-search1.7, - libpcl-segmentation1.7, - libpcl-surface1.7, - libpcl-tracking1.7, - libpcl-visualization1.7 + libpcl-apps1.8, + libpcl-common1.8, + libpcl-features1.8, + libpcl-filters1.8, + libpcl-io1.8, + libpcl-kdtree1.8, + libpcl-keypoints1.8, + libpcl-ml1.8, + libpcl-octree1.8, + libpcl-outofcore1.8, + libpcl-people1.8, + libpcl-recognition1.8, + libpcl-registration1.8, + libpcl-sample-consensus1.8, + libpcl-search1.8, + libpcl-segmentation1.8, + libpcl-stereo1.8, + libpcl-surface1.8, + libpcl-tracking1.8, + libpcl-visualization1.8 Description: Point Cloud Library -- metapackage The Point Cloud Library (PCL) is a standalone, large scale, open project for 2D/3D image and point cloud processing. @@ -86,23 +90,21 @@ Description: Point Cloud Library -- metapackage including filtering, feature estimation, surface reconstruction, registration, model fitting and segmentation. -Package: libpcl1.7-dbg +Package: libpcl-apps1.8 Architecture: any -Section: debug -Depends: libpcl1.7 (= ${binary:Version}), - ${misc:Depends} Multi-Arch: same -Description: Point Cloud Library - debugging symbols - The Point Cloud Library (PCL) is a standalone, large scale, open - project for 2D/3D image and point cloud processing. - . - The PCL framework contains numerous state-of-the art algorithms - including filtering, feature estimation, surface reconstruction, - registration, model fitting and segmentation. +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Point Cloud Library - apps library + The PCL framework contains numerous state-of-the art algorithms including + filtering, feature estimation, surface reconstruction, registration, model + fitting and segmentation. . - This package contains the debugging symbols for the shared libraries. + This package contains the libraries needed to run applications depending + on PCL apps. -Package: libpcl-common1.7 +Package: libpcl-common1.8 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} @@ -118,20 +120,7 @@ Description: Point Cloud Library - common library . This package contains the PCL common library. -Package: libpcl-apps1.7 -Architecture: any -Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, - ${misc:Depends} -Description: Point Cloud Library - apps library - The PCL framework contains numerous state-of-the art algorithms including - filtering, feature estimation, surface reconstruction, registration, model - fitting and segmentation. - . - This package contains the libraries needed to run applications depending - on PCL apps. - -Package: libpcl-features1.7 +Package: libpcl-features1.8 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} @@ -147,7 +136,7 @@ Description: Point Cloud Library - features library . This package contains the PCL features library. -Package: libpcl-filters1.7 +Package: libpcl-filters1.8 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} @@ -163,7 +152,7 @@ Description: Point Cloud Library - filters library . This package contains the PCL filters library. -Package: libpcl-io1.7 +Package: libpcl-io1.8 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} @@ -180,7 +169,7 @@ Description: Point Cloud Library - I/O library This package contains the libraries needed to run applications depending on PCL io. -Package: libpcl-kdtree1.7 +Package: libpcl-kdtree1.8 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} @@ -196,7 +185,7 @@ Description: Point Cloud Library - kdtree library . This package contains the PCL kdtree library. -Package: libpcl-keypoints1.7 +Package: libpcl-keypoints1.8 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} @@ -212,7 +201,23 @@ Description: Point Cloud Library - keypoints library . This package contains the PCL keypoints library. -Package: libpcl-octree1.7 +Package: libpcl-ml1.8 +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Point Cloud Library - ml library + The Point Cloud Library (PCL) is a standalone, large scale, open + project for 2D/3D image and point cloud processing. + . + The PCL framework contains numerous state-of-the art algorithms + including filtering, feature estimation, surface reconstruction, + registration, model fitting and segmentation. + . + This package contains the PCL ml library. + +Package: libpcl-octree1.8 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} @@ -228,7 +233,49 @@ Description: Point Cloud Library - octree library . This package contains the PCL octree library. -Package: libpcl-registration1.7 +Package: libpcl-outofcore1.8 +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Point Cloud Library - outofcore library + The PCL framework contains numerous state-of-the art algorithms including + filtering, feature estimation, surface reconstruction, registration, model + fitting and segmentation. + . + This package contains the libraries needed to run applications + depending on PCL outofcore. + +Package: libpcl-people1.8 +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Point Cloud Library - people library + The PCL framework contains numerous state-of-the art algorithms including + filtering, feature estimation, surface reconstruction, registration, model + fitting and segmentation. + . + This package contains the libraries needed to run applications + depending on PCL people. + +Package: libpcl-recognition1.8 +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Point Cloud Library - recognition library + The PCL framework contains numerous state-of-the art algorithms including + filtering, feature estimation, surface reconstruction, registration, model + fitting and segmentation. + . + This package contains the libraries needed to run applications + depending on PCL recognition. + +Package: libpcl-registration1.8 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} @@ -244,7 +291,7 @@ Description: Point Cloud Library - registration library . This package contains the PCL registration library. -Package: libpcl-sample-consensus1.7 +Package: libpcl-sample-consensus1.8 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} @@ -260,7 +307,7 @@ Description: Point Cloud Library - sample consensus library . This package contains the PCL sample consensus library. -Package: libpcl-search1.7 +Package: libpcl-search1.8 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} @@ -276,7 +323,7 @@ Description: Point Cloud Library - search library . This package contains the PCL search library. -Package: libpcl-segmentation1.7 +Package: libpcl-segmentation1.8 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} @@ -292,13 +339,13 @@ Description: Point Cloud Library - segmentation library . This package contains the PCL segmentation library. -Package: libpcl-surface1.7 +Package: libpcl-stereo1.8 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Point Cloud Library - surface library +Description: Point Cloud Library - stereo library The Point Cloud Library (PCL) is a standalone, large scale, open project for 2D/3D image and point cloud processing. . @@ -306,15 +353,15 @@ Description: Point Cloud Library - surface library including filtering, feature estimation, surface reconstruction, registration, model fitting and segmentation. . - This package contains the PCL surface library. + This package contains the PCL stereo library. -Package: libpcl-tracking1.7 +Package: libpcl-surface1.8 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Point Cloud Library - tracking library +Description: Point Cloud Library - surface library The Point Cloud Library (PCL) is a standalone, large scale, open project for 2D/3D image and point cloud processing. . @@ -322,15 +369,15 @@ Description: Point Cloud Library - tracking library including filtering, feature estimation, surface reconstruction, registration, model fitting and segmentation. . - This package contains the PCL tracking library. + This package contains the PCL surface library. -Package: libpcl-visualization1.7 +Package: libpcl-tracking1.8 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Point Cloud Library - visualization library +Description: Point Cloud Library - tracking library The Point Cloud Library (PCL) is a standalone, large scale, open project for 2D/3D image and point cloud processing. . @@ -338,57 +385,29 @@ Description: Point Cloud Library - visualization library including filtering, feature estimation, surface reconstruction, registration, model fitting and segmentation. . - This package contains the PCL visualization library. - - + This package contains the PCL tracking library. -Package: libpcl-outofcore1.7 +Package: libpcl-visualization1.8 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, - ${misc:Depends} -Description: Point Cloud Library - outofcore library - The PCL framework contains numerous state-of-the art algorithms including - filtering, feature estimation, surface reconstruction, registration, model - fitting and segmentation. - . - This package contains the libraries needed to run applications - depending on PCL outofcore. - -Package: libpcl-people1.7 -Architecture: any -Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, - ${misc:Depends} -Description: Point Cloud Library - people library - The PCL framework contains numerous state-of-the art algorithms including - filtering, feature estimation, surface reconstruction, registration, model - fitting and segmentation. +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Point Cloud Library - visualization library + The Point Cloud Library (PCL) is a standalone, large scale, open + project for 2D/3D image and point cloud processing. . - This package contains the libraries needed to run applications - depending on PCL people. - -Package: libpcl-recognition1.7 -Architecture: any -Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, - ${misc:Depends} -Description: Point Cloud Library - recognition library - The PCL framework contains numerous state-of-the art algorithms including - filtering, feature estimation, surface reconstruction, registration, model - fitting and segmentation. + The PCL framework contains numerous state-of-the art algorithms + including filtering, feature estimation, surface reconstruction, + registration, model fitting and segmentation. . - This package contains the libraries needed to run applications - depending on PCL recognition. + This package contains the PCL visualization library. Package: pcl-tools Architecture: any Section: science Depends: ${misc:Depends}, ${shlibs:Depends}, - libpcl1.7 (>= ${binary:Version}) + libpcl1.8 (>= ${binary:Version}) Multi-Arch: foreign Description: Point Cloud Library - point cloud processing tools The Point Cloud Library (PCL) is a standalone, large scale, open @@ -400,7 +419,6 @@ Description: Point Cloud Library - point cloud processing tools . This package gathers tools bundled with PCL to process point clouds. - Package: libpcl-doc Architecture: all Section: doc diff --git a/debian/copyright b/debian/copyright index 61ffffba..9fb89eff 100644 --- a/debian/copyright +++ b/debian/copyright @@ -283,8 +283,8 @@ Copyright: 2012, Sudarshan Srinivasan License: BSD-2-clause Files: common/src/bearing_angle_image.cpp - common/include/pcl/range_image/bearing_angle_image.h - test/test_bearing_angle_image.cpp + common/include/pcl/range_image/bearing_angle_image.h + test/common/test_bearing_angle_image.cpp Copyright: 2013, Intelligent Robotics Lab, DLUT. License: BSD-3-clause diff --git a/debian/libpcl-apps1.7.install b/debian/libpcl-apps1.8.install similarity index 100% rename from debian/libpcl-apps1.7.install rename to debian/libpcl-apps1.8.install diff --git a/debian/libpcl-common1.7.install b/debian/libpcl-common1.8.install similarity index 100% rename from debian/libpcl-common1.7.install rename to debian/libpcl-common1.8.install diff --git a/debian/libpcl-dev.install b/debian/libpcl-dev.install index e84b7081..a2cc453e 100755 --- a/debian/libpcl-dev.install +++ b/debian/libpcl-dev.install @@ -2,21 +2,4 @@ usr/include/* usr/lib/*/pkgconfig/* usr/share/pcl*/*.cmake usr/lib/${DEB_HOST_MULTIARCH}/cmake/pcl/ -usr/lib/*/libpcl_common.so -usr/lib/*/libpcl_features.so -usr/lib/*/libpcl_filters.so -usr/lib/*/libpcl_io.so -usr/lib/*/libpcl_io_ply.so -usr/lib/*/libpcl_kdtree.so -usr/lib/*/libpcl_keypoints.so -usr/lib/*/libpcl_octree.so -usr/lib/*/libpcl_outofcore.so -usr/lib/*/libpcl_people.so -usr/lib/*/libpcl_recognition.so -usr/lib/*/libpcl_registration.so -usr/lib/*/libpcl_sample_consensus.so -usr/lib/*/libpcl_search.so -usr/lib/*/libpcl_segmentation.so -usr/lib/*/libpcl_surface.so -usr/lib/*/libpcl_tracking.so -usr/lib/*/libpcl_visualization.so +usr/lib/*/libpcl_*.so diff --git a/debian/libpcl-dev.lintian-overrides b/debian/libpcl-dev.lintian-overrides deleted file mode 100644 index b7e5aa6c..00000000 --- a/debian/libpcl-dev.lintian-overrides +++ /dev/null @@ -1,21 +0,0 @@ -## -# Lintian false-positive, link destination not in this package or direct dependency but indirect yes. -package-contains-broken-symlink usr/lib/x86_64-linux-gnu/libpcl_common.so libpcl_common.so.1.7 -package-contains-broken-symlink usr/lib/x86_64-linux-gnu/libpcl_features.so libpcl_features.so.1.7 -package-contains-broken-symlink usr/lib/x86_64-linux-gnu/libpcl_filters.so libpcl_filters.so.1.7 -package-contains-broken-symlink usr/lib/x86_64-linux-gnu/libpcl_io.so libpcl_io.so.1.7 -package-contains-broken-symlink usr/lib/x86_64-linux-gnu/libpcl_io_ply.so libpcl_io_ply.so.1.7 -package-contains-broken-symlink usr/lib/x86_64-linux-gnu/libpcl_kdtree.so libpcl_kdtree.so.1.7 -package-contains-broken-symlink usr/lib/x86_64-linux-gnu/libpcl_keypoints.so libpcl_keypoints.so.1.7 -package-contains-broken-symlink usr/lib/x86_64-linux-gnu/libpcl_octree.so libpcl_octree.so.1.7 -package-contains-broken-symlink usr/lib/x86_64-linux-gnu/libpcl_outofcore.so libpcl_outofcore.so.1.7 -package-contains-broken-symlink usr/lib/x86_64-linux-gnu/libpcl_people.so libpcl_people.so.1.7 -package-contains-broken-symlink usr/lib/x86_64-linux-gnu/libpcl_recognition.so libpcl_recognition.so.1.7 -package-contains-broken-symlink usr/lib/x86_64-linux-gnu/libpcl_registration.so libpcl_registration.so.1.7 -package-contains-broken-symlink usr/lib/x86_64-linux-gnu/libpcl_sample_consensus.so libpcl_sample_consensus.so.1.7 -package-contains-broken-symlink usr/lib/x86_64-linux-gnu/libpcl_search.so libpcl_search.so.1.7 -package-contains-broken-symlink usr/lib/x86_64-linux-gnu/libpcl_segmentation.so libpcl_segmentation.so.1.7 -package-contains-broken-symlink usr/lib/x86_64-linux-gnu/libpcl_surface.so libpcl_surface.so.1.7 -package-contains-broken-symlink usr/lib/x86_64-linux-gnu/libpcl_tracking.so libpcl_tracking.so.1.7 -package-contains-broken-symlink usr/lib/x86_64-linux-gnu/libpcl_visualization.so libpcl_visualization.so.1.7 -package-contains-broken-symlink usr/share/doc/libpcl-dev/changelog.gz ../libpcl-common1.7/changelog.gz \ No newline at end of file diff --git a/debian/libpcl-doc.docs b/debian/libpcl-doc.docs index a205e960..52675725 100644 --- a/debian/libpcl-doc.docs +++ b/debian/libpcl-doc.docs @@ -1 +1 @@ -debian/tmp/usr/share/doc/pcl-1.7/html +debian/tmp/usr/share/doc/pcl-1.8/html diff --git a/debian/libpcl-doc.lintian-overrides b/debian/libpcl-doc.lintian-overrides deleted file mode 100644 index 5326e182..00000000 --- a/debian/libpcl-doc.lintian-overrides +++ /dev/null @@ -1,36 +0,0 @@ -# TODO -# this warning is experimental, but this files should be included -privacy-breach-generic usr/share/doc/libpcl-doc/html/group__features.html (http://www.pointclouds.org/assets/images/contents/documentation/features_normal.png) -privacy-breach-generic usr/share/doc/libpcl-doc/html/group__features.html (http://www.pointclouds.org/assets/images/contents/documentation/features_bunny.png) -privacy-breach-generic usr/share/doc/libpcl-doc/html/group__filters.html (http://www.pointclouds.org/assets/images/contents/documentation/filters_statistical_noise.png) -privacy-breach-generic usr/share/doc/libpcl-doc/html/group__io.html (http://pointclouds.org/assets/images/contents/documentation/io/pr2.jpg) -privacy-breach-generic usr/share/doc/libpcl-doc/html/group__io.html (http://pointclouds.org/assets/images/contents/documentation/io/composite.jpg) -privacy-breach-generic usr/share/doc/libpcl-doc/html/group__io.html (http://pointclouds.org/assets/images/contents/documentation/io/lms400.jpg) -privacy-breach-generic usr/share/doc/libpcl-doc/html/group__io.html (http://pointclouds.org/assets/images/contents/documentation/io/openni.jpg) -privacy-breach-generic usr/share/doc/libpcl-doc/html/group__io.html (http://pointclouds.org/assets/images/contents/documentation/io/trimble.jpg) -privacy-breach-generic usr/share/doc/libpcl-doc/html/group__io.html (http://pointclouds.org/assets/images/contents/documentation/io/minolta.jpg) -privacy-breach-generic usr/share/doc/libpcl-doc/html/group__io.html (http://pointclouds.org/assets/images/contents/documentation/io/fujiw3.jpg) -privacy-breach-generic usr/share/doc/libpcl-doc/html/group__io.html (http://pointclouds.org/assets/images/contents/documentation/io/borg.jpg) -privacy-breach-generic usr/share/doc/libpcl-doc/html/group__kdtree.html (http://www.pointclouds.org/assets/images/contents/documentation/kdtree_mug.png) -privacy-breach-generic usr/share/doc/libpcl-doc/html/group__octree.html (http://www.pointclouds.org/assets/images/contents/documentation/octree_bunny.png) -privacy-breach-generic usr/share/doc/libpcl-doc/html/group__registration.html (http://www.pointclouds.org/assets/images/contents/documentation/registration_outdoor.png) -privacy-breach-generic usr/share/doc/libpcl-doc/html/group__registration.html (http://www.pointclouds.org/assets/images/contents/documentation/registration_closeup.png) -privacy-breach-generic usr/share/doc/libpcl-doc/html/group__sample__consensus.html (http://www.pointclouds.org/assets/images/contents/documentation/sample_consensus_planes_cylinders.png) -privacy-breach-generic usr/share/doc/libpcl-doc/html/group__surface.html (http://www.pointclouds.org/documentation/tutorials/_images/resampling_1.jpg) -privacy-breach-generic usr/share/doc/libpcl-doc/html/group__surface.html (http://www.pointclouds.org/assets/images/contents/documentation/surface_meshing.png) -privacy-breach-generic usr/share/doc/libpcl-doc/html/group__surface.html (http://www.pointclouds.org/assets/images/contents/documentation/surface_hull.png) -privacy-breach-generic usr/share/doc/libpcl-doc/html/group__visualization.html (http://www.pointclouds.org/documentation/overview/_images/bunny.jpg) -privacy-breach-generic usr/share/doc/libpcl-doc/html/group__visualization.html (http://www.pointclouds.org/documentation/overview/_images/shapes.jpg) -privacy-breach-generic usr/share/doc/libpcl-doc/html/group__visualization.html (http://www.pointclouds.org/documentation/overview/_images/histogram.jpg) -privacy-breach-generic usr/share/doc/libpcl-doc/html/group__visualization.html (http://www.pointclouds.org/documentation/overview/_images/normals.jpg) -privacy-breach-generic usr/share/doc/libpcl-doc/html/group__visualization.html (http://www.pointclouds.org/documentation/overview/_images/pcs.jpg) -privacy-breach-generic usr/share/doc/libpcl-doc/html/group__visualization.html (http://www.pointclouds.org/documentation/overview/_images/range_image.jpg) - - -# this file is licenced under Creative Commons Attribution 3.0. http://creativecommons.org/licenses/by/3.0/ -# and it's DFSG compilant. -privacy-breach-logo usr/share/doc/libpcl-doc/html/index.html (http://www.pointclouds.org/assets/images/contents/logos/pointcloudlibrary_logo.png) - - -## Files exists in a non direct dependency -package-contains-broken-symlink usr/share/doc/libpcl-doc/changelog.gz ../libpcl-common1.7/changelog.gz diff --git a/debian/libpcl-features1.7.install b/debian/libpcl-features1.8.install similarity index 100% rename from debian/libpcl-features1.7.install rename to debian/libpcl-features1.8.install diff --git a/debian/libpcl-filters1.7.install b/debian/libpcl-filters1.8.install similarity index 100% rename from debian/libpcl-filters1.7.install rename to debian/libpcl-filters1.8.install diff --git a/debian/libpcl-io1.7.install b/debian/libpcl-io1.8.install similarity index 100% rename from debian/libpcl-io1.7.install rename to debian/libpcl-io1.8.install diff --git a/debian/libpcl-kdtree1.7.install b/debian/libpcl-kdtree1.8.install similarity index 100% rename from debian/libpcl-kdtree1.7.install rename to debian/libpcl-kdtree1.8.install diff --git a/debian/libpcl-keypoints1.7.install b/debian/libpcl-keypoints1.8.install similarity index 100% rename from debian/libpcl-keypoints1.7.install rename to debian/libpcl-keypoints1.8.install diff --git a/debian/libpcl-ml1.8.install b/debian/libpcl-ml1.8.install new file mode 100644 index 00000000..ba9e8650 --- /dev/null +++ b/debian/libpcl-ml1.8.install @@ -0,0 +1 @@ +usr/lib/*/libpcl_ml.so.* diff --git a/debian/libpcl-octree1.7.lintian-overrides b/debian/libpcl-octree1.7.lintian-overrides deleted file mode 100644 index a3488614..00000000 --- a/debian/libpcl-octree1.7.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -## -# Lintian false-positive, link destination not in this package or direct dependency but indirect yes. -package-contains-broken-symlink usr/share/doc/libpcl-octree1.7/changelog.gz ../libpcl-common1.7/changelog.gz \ No newline at end of file diff --git a/debian/libpcl-octree1.7.install b/debian/libpcl-octree1.8.install similarity index 100% rename from debian/libpcl-octree1.7.install rename to debian/libpcl-octree1.8.install diff --git a/debian/libpcl-outofcore1.7.install b/debian/libpcl-outofcore1.8.install similarity index 100% rename from debian/libpcl-outofcore1.7.install rename to debian/libpcl-outofcore1.8.install diff --git a/debian/libpcl-people1.7.lintian-overrides b/debian/libpcl-people1.7.lintian-overrides deleted file mode 100644 index 474f1d65..00000000 --- a/debian/libpcl-people1.7.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# Lintian false-positive, link destination not in this package or direct dependency but indirect yes -package-contains-broken-symlink usr/share/doc/libpcl-people1.7/changelog.gz ../libpcl-common1.7/changelog.gz diff --git a/debian/libpcl-people1.7.install b/debian/libpcl-people1.8.install similarity index 100% rename from debian/libpcl-people1.7.install rename to debian/libpcl-people1.8.install diff --git a/debian/libpcl-recognition1.7.install b/debian/libpcl-recognition1.8.install similarity index 100% rename from debian/libpcl-recognition1.7.install rename to debian/libpcl-recognition1.8.install diff --git a/debian/libpcl-registration1.7.install b/debian/libpcl-registration1.8.install similarity index 100% rename from debian/libpcl-registration1.7.install rename to debian/libpcl-registration1.8.install diff --git a/debian/libpcl-sample-consensus1.7.install b/debian/libpcl-sample-consensus1.8.install similarity index 100% rename from debian/libpcl-sample-consensus1.7.install rename to debian/libpcl-sample-consensus1.8.install diff --git a/debian/libpcl-search1.7.install b/debian/libpcl-search1.8.install similarity index 100% rename from debian/libpcl-search1.7.install rename to debian/libpcl-search1.8.install diff --git a/debian/libpcl-segmentation1.7.install b/debian/libpcl-segmentation1.8.install similarity index 100% rename from debian/libpcl-segmentation1.7.install rename to debian/libpcl-segmentation1.8.install diff --git a/debian/libpcl-stereo1.8.install b/debian/libpcl-stereo1.8.install new file mode 100644 index 00000000..9923db84 --- /dev/null +++ b/debian/libpcl-stereo1.8.install @@ -0,0 +1 @@ +usr/lib/*/libpcl_stereo.so.* diff --git a/debian/libpcl-surface1.7.install b/debian/libpcl-surface1.8.install similarity index 100% rename from debian/libpcl-surface1.7.install rename to debian/libpcl-surface1.8.install diff --git a/debian/libpcl-tracking1.7.install b/debian/libpcl-tracking1.8.install similarity index 100% rename from debian/libpcl-tracking1.7.install rename to debian/libpcl-tracking1.8.install diff --git a/debian/libpcl-visualization1.7.install b/debian/libpcl-visualization1.8.install similarity index 100% rename from debian/libpcl-visualization1.7.install rename to debian/libpcl-visualization1.8.install diff --git a/debian/libpcl1.7-dbg.install b/debian/libpcl1.7-dbg.install deleted file mode 100644 index ff42a9e4..00000000 --- a/debian/libpcl1.7-dbg.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/doc/libpcl1.7-dbg/* diff --git a/debian/libpcl1.7-dbg.lintian-overrides b/debian/libpcl1.7-dbg.lintian-overrides deleted file mode 100644 index 7a77d88b..00000000 --- a/debian/libpcl1.7-dbg.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -## -# Lintian false-positive, link destination not in this package or direct dependency but indirect yes. -package-contains-broken-symlink usr/share/doc/libpcl1.7-dbg/changelog.gz ../libpcl-common1.7/changelog.gz diff --git a/debian/rules b/debian/rules index 0f0bab14..e2bcd8ce 100755 --- a/debian/rules +++ b/debian/rules @@ -31,8 +31,7 @@ endif .PHONY: override_dh_auto_configure \ override_dh_install \ - override_dh_installchangelogs \ - override_dh_strip + override_dh_installchangelogs override_dh_auto_configure: dh_auto_configure -- \ @@ -50,8 +49,6 @@ override_dh_auto_configure: $(BUILD_DOC) override_dh_install: - mkdir -p debian/tmp/usr/share/doc/libpcl1.7-dbg && cp debian/README.Debug debian/tmp/usr/share/doc/libpcl1.7-dbg/ - @for i in pcl_concatenate_points_pcd pcl_grabcut_2d \ pcl_elch pcl_dinast_grabber pcl_hdl_grabber \ pcl_icp pcl_icp2d pcl_lum pcl_manual_registration pcl_match_linemod_template \ @@ -72,6 +69,12 @@ override_dh_install: pcl_generate pcl_grid_min pcl_in_hand_scanner pcl_local_max \ pcl_morph pcl_ni_trajkovic pcl_obj2pcd pcl_offline_integration \ pcl_openni_klt pcl_progressive_morphological_filter \ + pcl_converter pcl_crf_segmentation pcl_face_trainer pcl_fs_face_detector \ + pcl_ni_brisk pcl_obj2ply pcl_openni_face_detector \ + pcl_openni_organized_edge_detection pcl_outofcore_viewer \ + pcl_pcd_introduce_nan pcl_pcd_organized_edge_detection \ + pcl_stereo_ground_segmentation pcl_train_unary_classifier \ + pcl_unary_classifier_segment pcl_vlp_viewer pcl_openni2_viewer \ pcl_openni_organized_multi_plane_segmentation; do \ cmd="dh_link -p pcl-tools usr/share/man/man1/pcl_pointclouds.1 usr/share/man/man1/$$i.1"; \ echo $$cmd; $$cmd; \ @@ -79,23 +82,20 @@ override_dh_install: dh_install --list-missing -override_dh_strip: - dh_strip -a --dbg-package=libpcl1.7-dbg - #override_dh_shlibdeps: # dh_shlibdeps -v -Xusr/bin/pcl_* -Lpcl-tools -l:$(CURDIR)/debian/usr/lib/${DEB_HOST_MULTIARCH}/cloud_composer_plugins: -ppcl --- -xpcl-tools -v override_dh_installchangelogs: - dh_installchangelogs -plibpcl-common1.7 CHANGES.md + dh_installchangelogs -plibpcl-common1.8 CHANGES.md # Creating dh_links to share the same file - @for i in libpcl-dev libpcl1.7 libpcl1.7-dbg libpcl-apps1.7 \ - libpcl-features1.7 libpcl-filters1.7 libpcl-io1.7 libpcl-kdtree1.7 \ - libpcl-keypoints1.7 libpcl-octree1.7 libpcl-registration1.7 \ - libpcl-sample-consensus1.7 libpcl-search1.7 libpcl-segmentation1.7 \ - libpcl-surface1.7 libpcl-tracking1.7 libpcl-visualization1.7 \ - libpcl-outofcore1.7 libpcl-people1.7 libpcl-recognition1.7 \ + @for i in libpcl-dev libpcl1.8 libpcl-apps1.8 \ + libpcl-features1.8 libpcl-filters1.8 libpcl-io1.8 libpcl-kdtree1.8 \ + libpcl-keypoints1.8 libpcl-octree1.8 libpcl-outofcore1.8 libpcl-people1.8 \ + libpcl-recognition1.8 libpcl-registration1.8 libpcl-sample-consensus1.8 \ + libpcl-search1.8 libpcl-segmentation1.8 libpcl-stereo1.8 \ + libpcl-surface1.8 libpcl-tracking1.8 libpcl-visualization1.8 \ pcl-tools libpcl-doc; do \ - cmd="dh_link -p$$i usr/share/doc/libpcl-common1.7/changelog.gz usr/share/doc/$$i/changelog.gz"; \ + cmd="dh_link -p$$i usr/share/doc/libpcl-common1.8/changelog.gz usr/share/doc/$$i/changelog.gz"; \ echo $$cmd; $$cmd; \ done dh_installchangelogs diff --git a/debian/watch b/debian/watch index 30567a6f..514f9c5a 100644 --- a/debian/watch +++ b/debian/watch @@ -3,6 +3,6 @@ version=3 #opts=uversionmangle=s/(\d)[_.+-]?((RC|rc|pre|dev|beta|alpha)[\d.]*)$/$1~$2/ \ #https://github.com/PointCloudLibrary/pcl/releases .*/pcl-(\d\S*)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) -opts="repacksuffix=+dfsg,uversionmangle=s/(\d)[_.+-]?((RC|rc|pre|dev|beta|alpha)[\d.]*)$/$1~$2+dfsg/" \ +opts="repacksuffix=+dfsg,dversionmangle=s/(\d)[_.+-]?((RC|rc|pre|dev|beta|alpha)[\d.]*)$/$1~$2+dfsg/" \ https://github.com/PointCloudLibrary/pcl/releases .*/pcl-(\d\S*)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) -- 2.30.2